From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 29 Oct 2012 03:55:43 +0000 (-0400)
Subject: Show 'Log out' in more situations
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5511
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=56909d06462233cb26412e3099c7fef62e2471c3;p=gnome-shell.git

Show 'Log out' in more situations

When the current user is a remote account, or a we are logged in
as root, we should always show 'Log out'.

https://bugzilla.gnome.org/show_bug.cgi?id=686736
---

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 8324fb157..d68b4e657 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -616,10 +616,12 @@ const UserMenuButton = new Lang.Class({
 
     _updateLogout: function() {
         let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
+        let systemAccount = this._user.system_account;
+        let localAccount = this._user.local_account;
         let multiUser = this._userManager.has_multiple_users;
         let multiSession = Gdm.get_session_ids().length > 1;
 
-        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession);
+        this._logoutItem.actor.visible = allowLogout && (multiUser || multiSession || systemAccount || !localAccount);
     },
 
     _updateLockScreen: function() {